From 1b94d19ac510a0316cd073f51e078fe3070327c9 Mon Sep 17 00:00:00 2001 From: Chanaka Jayasena Date: Wed, 18 Dec 2013 20:13:36 +0530 Subject: [PATCH] Fix the wrong url links on page header --- .../themes/theme1/pages/index.hbs | 1 + .../themes/theme1/partials/cartridges.hbs | 2 +- .../themes/theme1/partials/header.hbs | 10 ++++---- .../themes/theme1/partials/mycartridges.hbs | 4 +- .../themes/theme1/renderers/cartridges.js | 3 +- .../themes/theme1/renderers/index.js | 4 +- .../themes/theme1/renderers/subscribe_cartridge.js | 3 +- .../themes/theme1/ui/css/main.css | 9 ++++--- .../themes/theme1/ui/custom-fonts/style.css | 24 ++++++++++---------- 9 files changed, 32 insertions(+), 28 deletions(-) diff --git a/components/org.apache.stratos.manager.console/themes/theme1/pages/index.hbs b/components/org.apache.stratos.manager.console/themes/theme1/pages/index.hbs index 9f98084..f0bd73c 100644 --- a/components/org.apache.stratos.manager.console/themes/theme1/pages/index.hbs +++ b/components/org.apache.stratos.manager.console/themes/theme1/pages/index.hbs @@ -23,6 +23,7 @@ + diff --git a/components/org.apache.stratos.manager.console/themes/theme1/partials/cartridges.hbs b/components/org.apache.stratos.manager.console/themes/theme1/partials/cartridges.hbs index 5e17e29..a2d9382 100644 --- a/components/org.apache.stratos.manager.console/themes/theme1/partials/cartridges.hbs +++ b/components/org.apache.stratos.manager.console/themes/theme1/partials/cartridges.hbs @@ -19,7 +19,7 @@
-
+
{{version}}
diff --git a/components/org.apache.stratos.manager.console/themes/theme1/partials/header.hbs b/components/org.apache.stratos.manager.console/themes/theme1/partials/header.hbs index aee6f98..8bf9a04 100644 --- a/components/org.apache.stratos.manager.console/themes/theme1/partials/header.hbs +++ b/components/org.apache.stratos.manager.console/themes/theme1/partials/header.hbs @@ -19,11 +19,11 @@
@@ -35,10 +35,10 @@
- {{name}} + {{name}}
- +

Create cartridges like PHP, Python, Ruby etc.. Or create data cartridges with mySql, PostgreSQL. Directly install applications like Drupal, Wordpress etc..

diff --git a/components/org.apache.stratos.manager.console/themes/theme1/partials/mycartridges.hbs b/components/org.apache.stratos.manager.console/themes/theme1/partials/mycartridges.hbs index 855d472..dfd6ba0 100644 --- a/components/org.apache.stratos.manager.console/themes/theme1/partials/mycartridges.hbs +++ b/components/org.apache.stratos.manager.console/themes/theme1/partials/mycartridges.hbs @@ -19,8 +19,8 @@
-
{{state}}
-
+
{{state}}
+
{{version}}
diff --git a/components/org.apache.stratos.manager.console/themes/theme1/renderers/cartridges.js b/components/org.apache.stratos.manager.console/themes/theme1/renderers/cartridges.js index d73a3a6..3d4e2f1 100644 --- a/components/org.apache.stratos.manager.console/themes/theme1/renderers/cartridges.js +++ b/components/org.apache.stratos.manager.console/themes/theme1/renderers/cartridges.js @@ -17,7 +17,8 @@ var render = function (theme, data, meta, require) { my_cartridges:true, link:'/', name:'Back To My Cartridges', - css:"btn-back" + class_name:"btn-default", + class_icon: "back-icon" } } ], diff --git a/components/org.apache.stratos.manager.console/themes/theme1/renderers/index.js b/components/org.apache.stratos.manager.console/themes/theme1/renderers/index.js index c995ae4..b754197 100644 --- a/components/org.apache.stratos.manager.console/themes/theme1/renderers/index.js +++ b/components/org.apache.stratos.manager.console/themes/theme1/renderers/index.js @@ -17,7 +17,7 @@ var render = function (theme, data, meta, require) { my_cartridges:true, link:'/cartridges.jag', name:'Subscribe to Cartridge', - css:"btn-important" + class_name:'btn-important' } } ], @@ -25,7 +25,7 @@ var render = function (theme, data, meta, require) { { partial:'title', context:{ - title:"My Cartridges" + title:'My Cartridges' } } ] diff --git a/components/org.apache.stratos.manager.console/themes/theme1/renderers/subscribe_cartridge.js b/components/org.apache.stratos.manager.console/themes/theme1/renderers/subscribe_cartridge.js index 6fbd1e7..d6c9a52 100644 --- a/components/org.apache.stratos.manager.console/themes/theme1/renderers/subscribe_cartridge.js +++ b/components/org.apache.stratos.manager.console/themes/theme1/renderers/subscribe_cartridge.js @@ -16,7 +16,8 @@ var render = function (theme, data, meta, require) { my_cartridges:true, link: '/cartridges.jag', name: 'Select different Cartridge', - css: "btn-back" + class_name: "btn-default", + class_icon: "back-icon" } } ], diff --git a/components/org.apache.stratos.manager.console/themes/theme1/ui/css/main.css b/components/org.apache.stratos.manager.console/themes/theme1/ui/css/main.css index 348d412..853e997 100644 --- a/components/org.apache.stratos.manager.console/themes/theme1/ui/css/main.css +++ b/components/org.apache.stratos.manager.console/themes/theme1/ui/css/main.css @@ -149,7 +149,7 @@ body { box-shadow: 1px 3px 4px 1px rgba(71,71,71,1); } .breadcrumb-strip{ - min-height: 78px; + min-height: 58px; z-index: 1; padding-top:10px; } @@ -207,17 +207,18 @@ body { margin-right:10px; } .content-starter{ - margin-top: 157px; + margin-top: 130px; } h1{ color:#575757; - font-size:44px; + font-size:37px; + margin-bottom: 0; } h2{ background: #fff; display: inline-block; padding:0 10px 0 0; - margin:10px 0; + margin:10px 0 20px; color:#575757; text-transform:capitalize; diff --git a/components/org.apache.stratos.manager.console/themes/theme1/ui/custom-fonts/style.css b/components/org.apache.stratos.manager.console/themes/theme1/ui/custom-fonts/style.css index eef84a7..49ff76e 100644 --- a/components/org.apache.stratos.manager.console/themes/theme1/ui/custom-fonts/style.css +++ b/components/org.apache.stratos.manager.console/themes/theme1/ui/custom-fonts/style.css @@ -9,7 +9,7 @@ font-style: normal; } -[class^="icon-"], [class*=" icon-"] { +[class^="icons-"], [class*=" icons-"] { font-family: 'stratos'; speak: none; font-style: normal; @@ -23,36 +23,36 @@ -moz-osx-font-smoothing: grayscale; } -.icon-active:before { +.icons-active:before { content: "\e600"; } -.icon-refresh:before { +.icons-refresh:before { content: "\e601"; } -.icon-mysql:before { +.icons-mysql:before { content: "\e602"; } -.icon-ruby:before { +.icons-ruby:before { content: "\e603"; } -.icon-php:before { +.icons-php:before { content: "\e604"; } -.icon-cakephp:before { +.icons-cakephp:before { content: "\e605"; } -.icon-python:before { +.icons-python:before { content: "\e606"; } -.icon-topology:before { +.icons-topology:before { content: "\e607"; } -.icon-help:before { +.icons-help:before { content: "\e608"; } -.icon-cartridge:before { +.icons-cartridge:before { content: "\e609"; } -.icon-tenant:before { +.icons-tenant:before { content: "\e60a"; } -- 1.7.9.msysgit.0